More options for custom forms, and bug fixes.