cleaning up some errors