fixed and removed some untracked files