clean up and make minor updates