Added all additions and fixes from Stolis Master to date:

This branch (different as is may be) is up to date now.
All relevant fixes from Sep 4 - Nov 18