more focus and adjusted some sorts