polish
incomplete version
shorten comments
PDF of incomplete