clean up and minor adj's