Added new quotes, clean up.