Several fixes to dps calculation method and misc areas