finished some updates and merge conflicts