clean up a bit
more senseful api, path fix
2.0.0