Updated bundles + some fixes in code