Many more improvements.
Merge branch 'master' into local_master
Get address_keeper working again.
Merge branch 'master' into local_master
Tests work, code a little better.
More tweaks.
Improve InvCollector.
Merge branch 'master' into local_master