some new calculations, minor changes