consistent use of ID. closes #17 and #21