cleanups and version inc