Bugfixes and screenshot