Added a toString and changed some minor things