More updated to docs and modified variables