forms, minor changes