Ismail fixes

Contains:
- Fix #20
- Fix #14
- Fix #25