fix indent
add names to kpi fields

somehow empty names was cause of crash with fromJust Nothing