fixing couple logic thingies