Minor changes
Merge branch 'DexterBranch'
Fixing things
Fixed merge conflicts