Jose Salvador: new small improvements and clean up