adding trailing whitespace nuker and other general improvements