Complete update

Some parts added, others modified.