Improvements and extensions to 1.1.3;