fixed bug in variable name;added  dashes for types, and annotations