cleanup
fix inverted section key handling