flash error messages included as well as other minor tweaks