Finished zoom-in and zoom-out features, some bugfixes and code clean-up.