Fixes + speed improvements