Fixed some bugs, and added bundle feature