Buss upgraded. And other stuff