Updated platform toolset to v110_xp
Misc cleanup
Updated TODO