fixed some minor bugs with the graphics.
Merge remote-tracking branch 'zukalous/fixedGraphics' into rotato_master