Added https and other fixes