clean up and minor changes