Round of updates
some changes