Fixing org locations and window closing on kill-buffer