fixed parsing error
added scripted expressions