Add and sort pirate things and actions
Fix miss-rebase