Some corrections in the code and saved workspace