Fixed compiler errors and warnings

Curiously, should we perhaps make it a habit to leave some informative //TODOs when we block comment stuff that (I am guessing) doesn't compile? I probably am guilty of not doing that myself but it seems like a thing to try :)