Improved some toString