Updated documentation

Other minor changes