a few minor tweaks before moving on to backend