Massive cleanup; preparing for 0.3 release.