merge back new updates and fixes