update usability | minor fixes