Tidy up for MINGW
Get parsing of components working.