Bugfixes
Final test images