more fix's and additions