Fixes the issues pointed out after the original harvester module was merged. Also merges the update rules as discussed on IRC.