Multiple changes; mostly updates to fake estimation