updates and changes

more calculations