Bugs and issues detected while debugging

[cdparra]

• [ ] #84
• [x] #85
• [ ] #86
• [ ] #87
• [x] #88
• [ ] #90
• [ ] #91
• [x] #92
• [ ] #93
• [x] #95

[jorgeramirez]

@cdparra I just fixed issue #92

[jorgeramirez]

@cdparra fixed #91