Fixes based on testing...

...but there's some wonkiness with the ad that will need further
testing later