Fixed output problems...