multiple fixes and updates