fixes + speed