Made final tweaks for first major data test, further clean up of repository.