added ID, other bug fixes (see wrike)