use https wherever possible
some clean up of mumbo jumbo stuffs