Fixing things I broke myself

Some logic that wasn't airtight is now more better...