misc clean up and comments