Got rid of TODOs, added bibliography