cversion and tiny updates