Some little corrections + Add a context to each text