More commenting

Also added some TODOs.