correcting spellings
#10: corrected id handling