Updated toString
Merge branch 'mobile'
added new toString methods and foundation for new csv output