Fixes for drawing

More lingering group stuff and drawing things.