It would also be nice if the weapons would automatically re-equip after my big toe touches the water