Nudged stuff here and there, simplified parsers added not, took parsers out of global