Derek's bug fixes to getters.php, updateForms.php