final updates

fixed names