Some additions to the last commit.