misc updates and changes