Lots of changes, lots of corrections. Getting there little by little