change TODO and fix path error