Added those two to the list and cleaned it up a little for ease of browsing.