Various small changes

Pickup requires a button press, blade boss is present, etc.