misc updates, formatting