Fixes and tweaks to toString() to make it better.