better variable handling
better image in content check
early return if in admin
Merge branch 'develop'