Refactoring, removing hybrid triggers, bug fixin'