Including untracked files and minor fixes