Added better variables for error messages and some form notification stuff