changed bundle, fixed some bugs