Removed drawing bugs