More updates.  Some slight special-case logic for shields, so fix
a shader issue.  Looking for a better solution.