Even more whitelisting and fixed two spelling errors.