Changes made in class 01/25

Corrected some issues made by the master file