Corrected some problems with format