minor updates to clean up