Fix old comments / debug stuff