final changes before first demo