Some adjusts, delete some crap