new features and syntax correction