Cleaning up, rebased with byron
Merge branch 'byron'
Merge branch 'byron'
Merge branch 'byron'
Merge branch 'byron'
index update