small refactors + speed ups...