Minor fixes and some documentation updates