Various stuff
Various changes
Package version update