minor change & debug