Thumbator: improvements