random improvements (sorted list, and surpressed warning)