minor clean up and updates