Fix bugs introduced in merge
Streamline documentation a little