+ add path handlers
* cleanup