form editing and some other minor features