Adds some unmerged changes.