Improve messages; Handle _id better