more optimizations, resolution things