Better debugability

[stefnotch]

#7 does a part of it. But we should do more.

e.g.

also maybe we should double check the bonus task, bc someone had problems with it i couldnt really debug/find the source of
-- @pkomon