final changes before first version