Fix keybindings
Add filename and timestamp