0.1aa

Moved a few arguments around, trying to make Map object more logical.