more work
kyle's changes, index stuff reverted
Merge branch 'make-it-perty'