Remove TODOs
Fix reference
Reorder bibliography