misc updates & changes