fixed drawing of circle/rectangle, fixed broken defaults, added not so functional zoom