added kind (path/point) and some enhancements