Bugfixes and images