tiny fixes & ssl improvements
merge