minor fixes (heading bug) and tweaks