misc subedting fixes and extra lines here and there