Fix typos & improve ids