picker refactored, less orders, shelf crash fixed