cleanup and some comments on this mess