Might & Aim calculations fixed

Fix1 by Daenks