Separating bundle object, part 1
Bugfixes, cleanup