Final revisions

Final revisions on all expressions.