Usability updates and a bug fix (missing function)