oops, lost some changes. Put them back in just now.