Tweaks, rem. debug print