minor improvements
0.6.3