Various fixes that prevented successfull harvesting and extraction in my environment
Merge pull request #2 from staffanm/feature/misc-robustness

Various fixes to make stuff actually run. Readability and stability fixes