Further fixes and tidying to 'better-seek'.