lots and lots of impovements and fixes, squished TODO items
version bump to 0.1.2