Minor improvements
Adjust documentation