Few last changes. Nothing much different from the last commit.