Issues

Thiss pull request fix some issues