Several changes. Second commit.