Bunch of syntax fixes I didn't notice in Notepad++