review and minor changes