tidy shortcuts
diff tool
update from mathias