Minor tweaks and refactors. A half-baked collection support and several UI tweaks. Just committing these are they are "old" changes and the current state turns out to be pretty stable.
