WOOO BUGFIXES! YEAAAAAAAAAAAH!