added eta; various other fixes