begin standardizing errors
merge in develop