Update, coms minor cleaups