Hackathon fixes

Well, until your code review I did not realize that all my problems are because tabs are used in spaghetti while my editor was configured to indent with spaces :) Now it's obvious, and I hope I already fixed it at the other places, sorry for that.