More Stuff and Cleaning up