some cleanup + added graphics modes