all kinds of fixes
added bundle