Cleaning up, Minor updates