various performance improvemnets