Several usaublity updates