just made MAP leaner. And cleaned up the headers