Better docs and a shot at better names.