Bugfixes and zoom