Merge code of improved Quakers-Earthquak

Merge all of my code back to the master branch.