bundle cleanup + various bits