Various changes
Merged edits.
Changes in order to test