clean up and minor changes / updates