Some corrections / Prepared update