Debugging, other modifications, problems solving

[apelttom]

Last debugging, changing in the code, solving latest problems (solve it, or kill it) and testing.