Doc update and some (concomitant) bug fixes