more cleanup work...things are getting ugly, and need to be straightened
out once in awhile