cleanup
cleanup in graphics code and added flags
well... fucked up last commit