Did lots of stuff... zooming is broken now, it's matt's fault for being dumb :(