Use knutins version of elli and some minor cleanups.