All around improvements
Fix merge conflict