Some tweaks / added null output and feeder modules