cleanup whitespace
fiddle some stuff to make windows builds happier