Updated

There were still some inconsistencies.