Corrected some minor problems...