More fixes. Semicolon is not a valid statement anymore. Cleaned up import grammar further