Quick Patch

Changed some displays and small optimizations to the code and a small
bug fix in the shielding