minor changes
reverts some of the better error handling