more fixes before performance