Syntax error fix and minor changes