litle fixes but not there yet