Fixed/simplified Pickup class.added remaining types