All changes requested by Mikel
Fixing bugs