Docs fix and re-worked constants