some modify
ignore .idea
fix a bug