a little more cleanup, fixed zooming issue