Cheatsheet/Weapon table 2

Cleanup and verification required.