partial commit
some updates