Continued: bug fixes in saving, editing, and clearing forms