Progress down simpleExpression()

Made some progress flowing down through simpleExpression(), made some
small fixes