more functions.php fixes