fixed most formatting errors