added ability to edit expressions
var initialized to last used on input and assingment statements
fixed origin/master branch conflicts that occured after --amend commit