More comments, added some labels and tool tips