Add salt to cipher, fix salt gen

Also updated version.