Tweaks.
Comment out debug section for now.