Fixed errors in Shape class