gundo added and some more modifications