Fix adpods.
Fix styling.
Merge pull request #423 from gsn/master

Merged from beta.