Added some basic error handling, updated production website