fixes to make DemoStrategy run; moved RemainderHandler to util