Fix typos, inconsistencies and mark some points as optional