Commenting

Added comments to uncommented methods. Added a couple of to-do items which I'll write up issues for.