codeclean
fix typeclasses errors
ufo done