Sorted a few bits