Continued work on isse 2 and doc.