Interface/documentation updates

cpplint will likely complain... so we probably should do this last.