Fixed issues after expert review (1 part).