misc refactoring: versions and make files