Minor refactoring plus misc. version updates in project