Various improvements
Improve some more