Moved enum into firm_types, fixed some typos.