version number, general cleanup