Reordered includes, optimized code, phpdoc block fixes, variable type fixes, working both bundles via events