[#1210] Minor changes after review
[#1210] Add some docs