minor changes/formatting and windows-to-unix line endings