Small fixes, removed pointless draw(...)