Shield bugs fixed.  Shield credit should be correct now.
Merge pull request #12 from nilsbrummond/shield-fixes

Shield bugs fixed.  Shield credit should be correct now.