General Syntax fixes and import syntax fix