Graphics, cleaning up code, clean up comments
merge conflicts resolved