reuploaded

There are some minor changes
No! This *can't* go here. The multiword will be in a separate file!