misc improvements, heartbleed fallout