Update datastore, added errors, added websvr