some minor changes and comment updates