Made some fields required, variable editing still needs fixing