touchup, minor api changes, lots of documentation