A bit more work on the browse stuff.