Bring up to date for new fixes

So I can commit UI changes...