Added some enhancements on toString(s)