Lots of small feature processing changes