extensions renamed. a couple small cleanup