Bugfixes I wrote in class