fix path handling, implement other makes