bug fix and cosmetic improvements