Made some overall changes.