added better hooks for jangular's sake
merged plugins