Added more packages and fixed some bugs