Added comments and halting of pickup