Merge "Added some docs, fixed some docs and made implicit checks explicit"