Change small parts as result of discussion