Added some finals and did some cleanup
Bumped version number to 0.2.0