Added Draw Mode Hints, Cleaned up Code