added window number and fixed flyspell