Pulling in controller and model updates along with various fixes.

Brings in #192 and #185