many fixes and updates