last minute fixes with eleanor.