Finished Common Type System homework
fixes