Form + other minor changes