fixed some issues regarding usability