Forms improvements and completions