misc updates and additions