little updates. Issue#417