Forms, scenarios, many improvements