wheee did some cleaning up, more clean up to come