Cleaned up and bugfixed for 0.1.0a release