usability major fixes