finished minor changes in all chaps