bug fix and config adjustment