Schoenmh/capt controll

Merging caption updates into furthest along security branch