Stripped out logging, small refactorings, updates to docs.