Bug hunting, some whitespace-conversion and a typo fixed while I'm at it