additional updates and fixes