Janx2/1.1

I put a lot of effort into rebasing my collection of improvements on the 1.1 branch. All commits are atomic/very small. 

Please have a look.