more fixes and updates