Various improvements
Upped version