river and feeder mode, bulk fixes, examples added