slight updates to error handlers and other issues