Various additions
Fixing merge conflicts