minor reorganization of stubs; updated docs