Fixed a few things from initial commit.