Various improvements
Hmmk