Fix wrapping issues
Fix sorting in .gitignore