add/improve few comments
Lockdown whitelist support