Changes based on Maxi's suggestions

Va pull...