BROKEN CODE. Small debugging tweaks.