v0.0.15, various refactoring