Variety of what should be non-essential changes, refactors, etc.
fixed merge