Bugfixes & bonus remake