final changes before beta