Iterative draw fix and other minor changes.