Minor fixes in first 150 lines.