few bug fixes and file name in window title