minor tweaks to bring api in line with docs.