cleanup
some more problems

taking a long time to reconstruct everything.