updated GraphicsManager and resolved a few conflicts