some updates... still working on