More exceptions and some changes in action and scheduler