-fixes + 20% speedup