Made list more consistent and corrected errors