Various improvements

As discussed, more or less ;)