updates TODO and tweaks mockup