bug and path fixes