Doc updates

Additional documentation and a couple of minor bug fixes