Refactored the action and controller logic, plus some bugfixes