clean up and a few other changes