Several changes. Just need to commit.