Pre-holidays PR

Bunch of updates