adds client side interface fixes from scrape_check branch