misc updates and fixes