1.1.2

Some minor fixes I missed in the first hotfix, also fixed some stupid shit I did.