tweaks, and solution for building under MSVS2012 (results only tested under Win7 for the moment)