Imporvements

+ made some another Improvements