small improvemnts