Cleanup and bug fixes
Prepared to release 0.0.15.