debugging
fix bugs