multiple fixes & updates