fixed some usability and performance issues