removed some superfluous commenting and cleaned up redundant includes in XMacros
fixed minor conflicts