some updates
fixed merge conflicts