Rank handling and bugfix for blades out