small cleanup
Merge remote-tracking branch 'origin/master' into Hacks
Working towards better editing UX