Changed more weapon stuff