Improved __repr__s
Improved __repr__s
Merge