MORE BUGFIXES!!!!