Added more documentation and a few TODOs
I don't know why these were excluded but they're not now