more cosmetic changes and some usability changes