fix & complete codes
fix codes