#3 some cleanups and version realignment