untracked files on master: 10c281c Cleanup
index on master: 10c281c Cleanup
WIP on master: 10c281c Cleanup
Clean/added a few