Cleanup and minor draw fixes.