tweaks, adding a little bit of list code back in