Ellipsis fixes

This PR includes many fixes to Ellipsis. It should be merge along with ellipsis-fixes branch on frontend