Bugfixes and better images