More refactoring; update version number