Weapons refactored, vehicles added