update error handling, remove old status views
update error handling