Fixed minor bugs (XA, XG, XM). But something is remaining.
Update calculation note.
Merge remote-tracking branch 'origin/master'