Documentation & other minor changes to pass Check