updates and cleaning up
more updates and clean up