Some changes to sequencing of weapon in decorate, some skill stuff