Heavy weapon fixes and improvements.