stripping a couple presentation things
stripping presentation of site; improved error handling