1.4 some fixes and "cancel" button

1.4 some fixes and "cancel" button
bug
problems with commit
problems with commit [2]
fixed maybe
fixed