more data

more cleanup. nearly there