Watch content size as well as container size (#2)

Missed some files, forgot to add some variable initialization.