cleaning up and more updates