updates to clean up some errors