Enter Bug; Secondary Weapon Label and Switch WIP

Work on issue #77 and fix to #75