Bug fixes, adding Java evaluation of expressions