Small fixes to index, code cleanup
Merge branch 'master' of https://github.com/Akollek/BreakSync