updated references and < 80 col line width