some add-ons and fixes