Fixing Phone Extensions and Other minor changes