Fix wrong index
#14 Another bunch of language improvements