Lots of little OCD fixes
Update to v1.1.5