gitignore
fix few small bugs