Adds cursorline, make, and trailing whitespace fix