varous fixes and updates