Improve stuff
Improvements