scrapper modifications

Signed-off-by: Joey Bronner <joeybronner@gmail.com>