Manually reverted to a point when my stuff worked

fixing some merge errors oops...