magic number cleanup
fix untracked files