update for new Reader/Writer API and kill warnings