more changes. still working on SSL issue