a few blind changes due to ssl issue, but more progress