fix typo
Style cleanup. Finish 'todo' section
fix line endings