Fix code completion problem for code templates #26
Minor improvements