Small map fix

Plus an Abort implementation (still needs some work to make accurate).