added orbital ellipticity, renamed variables