fixed some usability issues