cleaned up some weapon changing code