revive shield symbolizer
various cleanups and fixes (doh..)