Better fix for unshield, comments on changes, no more commented out code.