Bug Fixes and Added buggy zooming