-fixes + speed improvement