stubs, minor improvements