Fix #3 and #4, and list description formatting.