Split/add and fixes

r u sure it's valid to pass `kwargs` down? Since it's new, it's probably safe, but I'm not sure it's a sound practice.