all done, except for some sorting issues