minor changes, mostly stubs