Lot of small improvements and changes.