Improvements
Fixed first bug