Some tweaks to toString