finished some more code genreating for expressions