some updates
ready to be merged