Update to Initial Commit

Fixes to initial commit.