more changes to improve/fix synthesis