fixed drawing stuff
refactored drawing