fixed up controller/directive