Add more logging (and add feature say)