Minor improvements
Etyllica 3.8