Refactor some drawing methods to 'generify' more.
Bump version number