Fixed bugs, performance discrepancy still odd however