Coder review things fixed.
Fixing bugs for distro.