Motivated by inspection of complex underwater environments, we have developed a system for multi-sensor SLAM utilizing both structured and unstructured environmental features. We present a system for deriving planar constraints from sonar data, and jointly optimizing the vehicle and plane positions as nodes in a factor graph. We also present a system for outlier rejection and smoothing of 3D sonar data, and for generating loop closure constraints based on the alignment of smoothed submaps. Our factor graph SLAM backend combines loop closure constraints from sonar data with detections of visual fiducial markers from camera imagery, and produces an online estimate of the full vehicle trajectory and landmark positions. We evaluate our technique on an inspection of a decomissioned aircraft carrier, as well as synthetic data and controlled indoor experiments, demonstrating improved trajectory estimates and reduced reprojection error in the final 3D map. My research supervisor, John Leonard, has provided invaluable advice, mentoring, and access to an overwhelming array of research projects and other opportunities. He would be the village wise man or chief, in constant contact with everyone, always available for advice both personal and professional, identifying problems to be overcome in our hunting and gathering activities, and coordinating trade with nearby villages to ensure we had adequate supplies for the winter.To my advisor Dana Yoerger, whose contagious energy sparked a passion for marine robotics, whose battle-tested wisdom guided me at land and at sea, I owe my entire career at MIT. I see him as the village shaman, dispensing sage advice while magically solving any problem with his beyond-mortal mastery of arcane technical systems.Michael Kaess has been absolutely essential to my academic progress, and I imagine him as the village's technical wizard. He would be master of emerging technologies like metal tools and mechanical advantage, and would share his knowledge generously to ensure the success of the entire community.Franz Hover, the chief of the village next door, has provided both long-term opportunities and day-to-day mentoring and advice. I am immensely grateful for his help, and have very much enjoyed our collaboration on both research and operations.My family is always close to my heart, and their support would be crucial to surviving the harsh alpine environment (although the closeness might be su↵ocating if we were holed up in a tiny yurt made of animal skins all winter, with only a sooty fire for warmth and the village passtime of pebble-tossing for entertainment). My mother Diane would certainly stay up all night helping me study the various edible roots and practice animal-skinning technique for my rite of passage into manhood, a 5 twelve-day journey into the icy mountains with nothing but a flint knife and alpacaskin blanket. Over meals of small game, my father Rex and I would discuss the finer points of glacier navigation, and occasionally get into heated debates about village politi...