Bug fixex and usebility enhancements
Bug fix and usebility enhancements