Fix markdown, move around some questions