Refining and debugging initial commit.