some improvements
1.1.2