more minor changes
bug fix