Whitespace killer
General fixes