some addidtions and fixes