Upped version
Various improvements
Upped version