cleanup and minor updates