Removed some debug output. Improved CSV/TeX output formatting