fixed some, still have problem with computeCount