Fixed many calculation issues