final fixes
Merge branch 'vicente'