several fixes and updates