Made some changes such as removing 2P option and a test puts I forgot to take out, plus updated the documentation a bit to reflect changes I hadn't reflected earlier.