#2: more errors fixed