some small fixes. Issue #6