Fixed ToString and one update.