Minor improvements and documentation

Minor improvements and documentation