Added descriptions and fixed markup a bit