Progress

Fixed errors