made a lot of changes, need to write eval and extend critiques to future work