more cleanups and weapon page fixes from last cleanup.