Syntax and variable improvements