skipping whitelisted messages; bugfixes