Removed some debug stuff
Atempt to fix the scrollbar
Merge branch '1.0.4b'