add additional items to be copied over, fix some typos, fix some bugs.