[order] Some improvements, type has been added, small fixes
Merge pull request #211 from aRn0D/order/component

[order] Some improvements, type has been added, small fixes