More bug fixes and the addition of a interface for dismissing the controller programmatically