Fixed imports and various syntax errors