some fixes

                   
|Q            |A  |
|---          |---|
|Fixed Tickets|   |
|License      |MIT|
                   


 Sent using [Gush](https://github.com/gushphp/gush)