more toString methods
Merge branch 'local'