small updates - still many things to fix