Add thread safety section and misc updates