calculator logic correction, map correction