minor improvements
bug fix