Some changes to make harvesting more solid.
Minor change
Merged victor's changes with master.