Importer fixes
Misc fixes
Misc fixes
Merged with v9
Misc fixes, passes most of test set again
Fixes to new member calendar code