started to remove bundling, other small fixes