removed completed stuff from TODO
improved some UX on recent changes