Fixed most calcTargets issues