Some changes in spelling, and testharnes ipv only