Clean up some object picking things.
Code comments.
Filter objects to be picked.
Correctly restore trigger event on reload.