add TODOs and fix urls