fix a lot of trash