fixing some usability