some bugs removed and some packages renamed