More refactoring and version changes + updating the readme.