Add scrap support. Fix bug in explorer implementation.