mod: weapon macros, weapon table, clean up