Re-added map command - not complete
Various other bits of todying/adjustments