Fixing toString, maybe not done