Add another bugfix for "old clothes" thoughts, and rearrange them a bit