All these things I've fixed

Would've liked more time to get this fully working.. Oh well.
Highlighting at least isn't gonna look terrible.