Minor improvemnts code and binary.