manual update to stage 4.1.1

Lots of changes here, don't know the best way to push them into the system - I guess one at a time, not all at once like this.