update format; hide untouched fields if necessary; fix bugs;
minor changes;
adding merged views;
minor changes;