version 0.2

Cleaned up some code. Fixed some bugs and minor details.