change is toString methods

	date still dosent work
	Reviewed by: Simon
mergeing again