Added a pile of changes.