Corrected a lot of model annotations and formatting