Added and modifed toString functions