a few minor changes, still unsure what to do with cnd