Prepping that User Controller and other tweaks.