fixed bug, more accurate maps, proper lengths