inital error return stuff
test fixes