more drawing hacks (NEED TO REWRITE THE WHOLE THING!)