more glitches fixed, and 'go pick up' works