import and syntax fixes