Few last changes.
Last updates (references)