Fix a few things.

Sorry, push unnecessary changes last night, wasn't aware. Also some faulty lines have been updated.