Corrected the model to handle two-handed weapons and firearms correctly.