make more lib-ish
2.0.0