Minor

Change of variables
Big update