Mostly removed debug code
Merge pull request #11 from Naosyth/bw-various-fixes

Mostly removed debug code