Fix dot drawing code. Does anyone use this stuff?!
Fix import issues, more robustly.
Ready for 0.1.2.