Fix empty verbose names; Add some explainatory comments