final changes before v1 launch;