Bugfixes and updated preview image