More cleanup, starting organization.
Riotgun rate of fire is equal between zoomed and unzoomed.  Other misc fixes
Organizational