Controller updates

A few bug fixes and updates