Version 1.eh: bug fixes.