fixed some fuck ups