minor api tweaks as well as html