v0.2 lots of additions and improvements