Made some smaller changes
Fixat en massa