Various improvements
1.0.0