A few fixes to build on Windows
Better fix for unshield, comments on changes, no more commented out code.