added .swp
modified regex and fixed typos