Fixed tracking and gitignore