PR for the fixing of previous fixes

Excessively explained commits.