Clean up

Create regions and drawing functions are now separated to allow for
independent calculation methods. Couple of bug fixes