mostly analysis additions, and range of bug fixes
resolved conflicts due to merge with Domenicos changes
minor changes