small changes, bug fix and msg level