Various improvements
better