ok, only one error left.  changed some methods and tests round a bit