use correct path
fix bugs