fixed and updates for 34ad7aa7