Added  some form defaults and a missing field or two