folding together all useful changes for the sake of good version control.