Added stroke scanner and vim changes