More draw refactoring
Fix drawing on midpoints (fixes #559)