Bug fixes by Elijah, SjG, and Alby. Works under 1.5.3.