Radom Fixes For sure this time

Fixed a collision case with the vanguard set and just a few other
assorted issues.