Closes #66
Display of sections on pop up showing wrong sections.

Other small tweaks and optimizations
Bump to version 4.1.1.