More gabe edits and corrections