Yet more fixes and more implemented features...  Getting close to merging
back with master...