I think this is stable...
Cleaned things up.
Merge branch 'master' into dec24