fix stubs, add new