seem to have worked out all the bugs...