Add calculation for p6 plus comment fixes