small fixes in ControllerAdditions and Matchers
merged