Refactoring harvest package (fixing misc issues)