couple more packages and some bug fixes