demo fixes, interface arg changes