begin cleanup for 0.2
finish cleanup for 0.2 release
final commit for 0.2