Syntax error and few other changes