Comments
Improved toString
Various