Changes to froms, and minor tweaks to functions.php