Bugfixes, no errors in console now