Bugfixes... now testing