Massive update. Many changes. Few comments.